From: Eli Zaretskii Date: Fri, 30 Oct 2015 21:17:48 +0000 (+0200) Subject: Fix a typo in a macro name X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~1764 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e11aaee266da52937a3a031cb108fe13f68958c3;p=emacs.git Fix a typo in a macro name * src/w32proc.c (_NLSCMPERROR): Fix a typo in the name of this macro. (w32_compare_strings): Adjust for the correction. --- diff --git a/src/w32proc.c b/src/w32proc.c index 8a1e17ec38f..a4e14965c87 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -3504,8 +3504,8 @@ get_lcid (const char *locale_name) return found_lcid; } -#ifndef _NSLCMPERROR -# define _NSLCMPERROR INT_MAX +#ifndef _NLSCMPERROR +# define _NLSCMPERROR INT_MAX #endif #ifndef LINGUISTIC_IGNORECASE # define LINGUISTIC_IGNORECASE 0x00000010 @@ -3546,7 +3546,7 @@ w32_compare_strings (const char *s1, const char *s2, char *locname, errno = EINVAL; /* This return value is compatible with wcscoll and other MS CRT functions. */ - return _NSLCMPERROR; + return _NLSCMPERROR; } } else @@ -3565,7 +3565,7 @@ w32_compare_strings (const char *s1, const char *s2, char *locname, else { errno = EINVAL; - return _NSLCMPERROR; + return _NLSCMPERROR; } needed = pMultiByteToWideChar (CP_UTF8, MB_ERR_INVALID_CHARS, s2, -1, NULL, 0); @@ -3579,7 +3579,7 @@ w32_compare_strings (const char *s1, const char *s2, char *locname, { SAFE_FREE (); errno = EINVAL; - return _NSLCMPERROR; + return _NLSCMPERROR; } if (locname) @@ -3616,7 +3616,7 @@ w32_compare_strings (const char *s1, const char *s2, char *locname, if (!val) { errno = EINVAL; - return _NSLCMPERROR; + return _NLSCMPERROR; } return val - 2; }